merge
authorvhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>
Wed, 15 Mar 2006 12:24:59 +0000 (12:24 +0000)
committervhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>
Wed, 15 Mar 2006 12:24:59 +0000 (12:24 +0000)

Trivial merge